Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump containerd to v1.7.20 #4799

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Bump containerd to v1.7.20 #4799

merged 1 commit into from
Jul 24, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jul 24, 2024

Description

https://github.com/containerd/containerd/releases/tag/v1.7.20

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123 twz123 added area/containers chore component/containerd backport/release-1.30 PR that needs to be backported/cherrypicked to the release-1.30 branch labels Jul 24, 2024
@twz123 twz123 marked this pull request as ready for review July 24, 2024 13:02
@twz123 twz123 requested a review from a team as a code owner July 24, 2024 13:02
@twz123 twz123 requested review from kke and jnummelin July 24, 2024 13:02
@twz123 twz123 enabled auto-merge July 24, 2024 16:21
@twz123 twz123 merged commit 5221e17 into k0sproject:main Jul 24, 2024
87 checks passed
@twz123 twz123 deleted the bump-containerd branch July 24, 2024 18:21
@k0s-bot
Copy link

k0s-bot commented Jul 24, 2024

Backport failed for release-1.30, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.30
git worktree add -d .worktree/backport-4799-to-release-1.30 origin/release-1.30
cd .worktree/backport-4799-to-release-1.30
git switch --create backport-4799-to-release-1.30
git cherry-pick -x 8ca91ea9771975b0e01da3508d6aed52df33e8a2

This was referenced Jul 24, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncopa ncopa ncopa approved these changes

@kke kke Awaiting requested review from kke kke is a code owner automatically assigned from k0sproject/k0s-maintainers

@jnummelin jnummelin Awaiting requested review from jnummelin jnummelin is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
area/containers backport/release-1.30 PR that needs to be backported/cherrypicked to the release-1.30 branch chore component/containerd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@twz123 @k0s-bot @ncopa